apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx (1)

168-185: Avoid invoking listHeader() twice per render.

listHeader() is called both for stickyHeaderIndices (line 232) and ListHeaderComponent (line 234). Each call constructs a fresh React element (including the FeaturedPacksSection subtree) on every render. Compute it once and reuse the result.

♻️ Proposed refactor

+      const headerNode = listHeader();
       <FlatList
         data={filteredTemplates}
         keyExtractor={(item) => item.id}
         renderItem={({ item }) => (
           <View className="px-4 pt-4">
             <PackTemplateCard templateId={item.id} onPress={handleTemplatePress} />
           </View>
         )}
-        stickyHeaderIndices={listHeader() ? [0] : undefined}
+        stickyHeaderIndices={headerNode ? [0] : undefined}
         stickyHeaderHiddenOnScroll
-        ListHeaderComponent={listHeader()}
+        ListHeaderComponent={headerNode}

Place const headerNode = listHeader(); just before the return (or memoize via useMemo keyed on searchValue, selectedTemplateTypeIndex, filteredTemplates.length).

Also applies to: 232-234

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx` around
lines 168 - 185, The listHeader() function is being invoked twice per render
(for stickyHeaderIndices and ListHeaderComponent) which recreates the
FeaturedPacksSection subtree each time; compute the header once and reuse it by
assigning const headerNode = listHeader() (or memoize via useMemo with
dependencies [searchValue.trim(), selectedTemplateTypeIndex,
filteredTemplates.length]) just before the return, then pass headerNode to both
stickyHeaderIndices/ListHeaderComponent instead of calling listHeader() again.

apps/expo/features/trips/components/TripForm.tsx (1)

115-119: Fix is correct; consider a slightly simpler equivalent.

The normalization correctly maps '' (from the Picker's "no pack selected" item with value=""), null (from trip?.packId defaults), and undefined all to undefined. The logic is sound.

Optional simplification (since packId is a non-empty string id when set, falsy coalescing is safe here):

♻️ Optional simplification

       const submitData = {
         ...value,
         location: location ?? value.location,
-        packId: value.packId === '' ? undefined : (value.packId ?? undefined),
+        packId: value.packId || undefined,
       };

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@apps/expo/features/trips/components/TripForm.tsx` around lines 115 - 119, The
submitData normalization for packId can be simplified: in the object build
inside submitData (referencing submitData and value.packId in TripForm.tsx),
replace the ternary and nullish combo (value.packId === '' ? undefined :
(value.packId ?? undefined)) with a simpler falsy-coalescing expression like
value.packId || undefined so '' / null / undefined all map to undefined; leave
the location mapping (location ?? value.location) as-is.

apps/expo/components/SearchInput.tsx (1)

11-27: Optional: simplify via React 19 ref-as-prop.

With React 19, forwardRef is no longer required — ref can be passed as a normal prop, which would let you drop forwardRef/useImperativeHandle/asNonNullableRef/assertPresent here and just attach both refs to the underlying component. The current implementation works, but it is more ceremony than necessary and assertPresent would throw if the imperative handle callback ever fires before the child has mounted its ref.

♻️ Possible simplification

-import { assertPresent } from '@packrat/guards';
-import { SearchInput as NativeWindUISearchInput } from '@packrat/ui/nativewindui';
+import { SearchInput as NativeWindUISearchInput } from '@packrat/ui/nativewindui';
 import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
 import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
-import { forwardRef, useImperativeHandle, useRef } from 'react';
+import { type ComponentProps, type ComponentRef, type Ref, useRef } from 'react';

-export const SearchInput = forwardRef<
-  React.ComponentRef<typeof NativeWindUISearchInput>,
-  React.ComponentProps<typeof NativeWindUISearchInput>
->((props, ref) => {
-  const searchInputRef = useRef<React.ComponentRef<typeof NativeWindUISearchInput>>(null);
-
-  useKeyboardHideBlur(asNonNullableRef(searchInputRef));
-
-  useImperativeHandle(ref, () => {
-    assertPresent(searchInputRef.current);
-    return searchInputRef.current;
-  }, []);
-
-  return <NativeWindUISearchInput ref={searchInputRef} {...props} />;
-});
-
-SearchInput.displayName = 'SearchInput';
+type SearchInputRef = ComponentRef<typeof NativeWindUISearchInput>;
+type SearchInputProps = ComponentProps<typeof NativeWindUISearchInput> & {
+  ref?: Ref<SearchInputRef>;
+};
+
+export const SearchInput = ({ ref, ...props }: SearchInputProps) => {
+  const searchInputRef = useRef<SearchInputRef>(null);
+  useKeyboardHideBlur(asNonNullableRef(searchInputRef));
+  return (
+    <NativeWindUISearchInput
+      ref={(node) => {
+        searchInputRef.current = node;
+        if (typeof ref === 'function') ref(node);
+        else if (ref) ref.current = node;
+      }}
+      {...props}
+    />
+  );
+};

As per library documentation: in React 19 "ref is now a regular prop; no need for forwardRef".

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@apps/expo/components/SearchInput.tsx` around lines 11 - 27, The SearchInput
wrapper is unnecessarily using forwardRef, useImperativeHandle,
asNonNullableRef, and assertPresent; simplify by treating ref as a normal prop
(drop forwardRef) and stop calling useImperativeHandle/assertPresent. Keep the
internal searchInputRef for useKeyboardHideBlur, then pass both the external ref
prop and searchInputRef to NativeWindUISearchInput (merge or pass as an
array/merged ref) so useKeyboardHideBlur(searchInputRef) still works and the
external ref is forwarded; remove useImperativeHandle, asNonNullableRef, and
assertPresent usages.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes